do not add @DL_LIBS@ to link line of babl.

	* babl.pc.in: do not add @DL_LIBS@ to link line of babl.

svn path=/trunk/; revision=290

diff --git a/ChangeLog b/ChangeLog
index 83ccc97477eaddd4895cc900fd73bc2d30354835..a8d07ee98dc9027844de3235ecc01afd453952bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-02  Øyvind Kolås  <pippin@gimp.org>
+
+       * babl.pc.in: do not add @DL_LIBS@ to link line of babl.
+
+2008-03-02  Øyvind Kolås  <pippin@gimp.org>
+
+       * tests/Makefile.am: applied patch from dmacks@netspace.org for
+       bug #519794.
+
 2008-03-02  Øyvind Kolås  <pippin@gimp.org>
 
        Applied patch from dmacks@netspace.org closing bug #519796

diff --git a/babl.pc.in b/babl.pc.in
index 04b1fa406c407caf41cfdd70f97301c57979488a..76b5e69fadc60e514a0024303028a59d4628f04f 100644 (file)
--- a/babl.pc.in
+++ b/babl.pc.in
@@ -7,5 +7,4 @@ Name: babl
 Description: Dynamic, any to any, pixel format conversion library
 Version: @BABL_REAL_VERSION@
 Cflags: -I${includedir}/@PACKAGE_NAME@-@BABL_API_VERSION@
-Libs: -L${libdir} -l@PACKAGE_NAME@-@BABL_API_VERSION@ @DL_LIB@ @MATH_LIB@
-
+Libs: -L${libdir} -l@PACKAGE_NAME@-@BABL_API_VERSION@ @MATH_LIB@

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8e514578cb87e69b437fa4f00d541de3827d49b2..478ac9a0b8f03537433acd642ba862b0114a2e84 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,20 +10,19 @@ TESTS =                             \
 
 TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions
 
-grayscale_to_rgb_SOURCES    = grayscale_to_rgb.c
-rgb_to_bgr_SOURCES          = rgb_to_bgr.c
-srgb_to_lab_u8_SOURCES      = srgb_to_lab_u8.c
-rgb_to_ycbcr_SOURCES        = rgb_to_ycbcr.c
-babl_class_name_SOURCES     = babl_class_name.c
-sanity_SOURCES              = sanity.c
-types_SOURCES               = types.c
+grayscale_to_rgb_SOURCES        = grayscale_to_rgb.c
+rgb_to_bgr_SOURCES              = rgb_to_bgr.c
+srgb_to_lab_u8_SOURCES          = srgb_to_lab_u8.c
+rgb_to_ycbcr_SOURCES            = rgb_to_ycbcr.c
+babl_class_name_SOURCES         = babl_class_name.c
+sanity_SOURCES                  = sanity.c
+types_SOURCES                   = types.c
 babl_fish_path_fitness_SOURCES  = babl_fish_path_fitness.c
-babl_fish_path_dhtml_SOURCES  = babl_fish_path_dhtml.c
-formats_SOURCES             = formats.c
-models_SOURCES              = models.c
+babl_fish_path_dhtml_SOURCES    = babl_fish_path_dhtml.c
+formats_SOURCES                 = formats.c
+models_SOURCES                  = models.c
 
-
-AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 
 LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \
        $(MATH_LIB)